[PATCH 1/5] libtraceevent: Fix header installation

Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=68401a1799fa14cb72c2a129bbefdacd44279772

When we passed some location in DESTDIR, install_headers called
do_install with DESTDIR as part of the second argument.

But do_install is again using '$(DESTDIR_SQ)$2', so as a result the
headers were installed in a location $DESTDIR/$DESTDIR.

In my testing I passed DESTDIR=/home/sudip/test and the headers were
installed in: /home/sudip/test/home/sudip/test/usr/include/traceevent.

Lets remove DESTDIR from the second argument of do_install so that the
headers are installed in the correct location.

Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lore.kernel.org/lkml/20191114133719.309-1-sudipm.mukherjee@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name 0001-libtraceevent-Fix-header-installation.patch

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index ecf882308d8a1b8c491d4e88d7294cfb5ecdbe21..c5a03356a99957c2087191340b2998d531b5c5e3 100644 (file)
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -234,10 +234,10 @@ install_pkgconfig:
 
 install_headers:
        $(call QUIET_INSTALL, headers) \
-               $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
-               $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
-               $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
-               $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
+               $(call do_install,event-parse.h,$(includedir_SQ),644); \
+               $(call do_install,event-utils.h,$(includedir_SQ),644); \
+               $(call do_install,trace-seq.h,$(includedir_SQ),644); \
+               $(call do_install,kbuffer.h,$(includedir_SQ),644)
 
 install: install_lib